Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorTom Rini <[email protected]>
Fri, 25 Apr 2014 19:06:51 +0000 (15:06 -0400)
committerTom Rini <[email protected]>
Fri, 25 Apr 2014 19:06:51 +0000 (15:06 -0400)

Trivial merge